Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Mon, 26 Apr 2010 12:48:35 +0000 (12:48 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Mon, 26 Apr 2010 12:48:35 +0000 (12:48 +0000)

Trivial merge